From: Jason Rumney <jasonr@gnu.org>
Date: Thu, 7 Jan 2010 13:53:57 +0000 (+0800)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8651^2~12
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=05d25919eafa95a2909d8e2565d01b0dbc207b30;p=emacs.git

Merge from trunk
---

05d25919eafa95a2909d8e2565d01b0dbc207b30